fix(decomp): token race flag not cleared properly #236
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
|
nice! according to commits history this wasnt even changed recently so i guess this bug was never noticed, good catch |
TheUbMunster
reviewed
Dec 8, 2025
|
|
||
| RECTMENU_ClearInput(); | ||
|
|
||
| sdata->Loading.OnBegin.AddBitsConfig0 |= ADVENTURE_ARENA; |
Contributor
There was a problem hiding this comment.
Associated ghidra: 
I believe this block should be
//above the if statement
sdata->Loading.OnBegin.AddBitsConfig0 |= ADVENTURE_ARENA;
//inside the if statement
sdata->Loading.OnBegin.AddBitsConfig8 |= SPAWN_AT_BOSS;
sdata->Loading.OnBegin.RemBitsConfig0 |= ADVENTURE_BOSS;I'm pretty sure that TOKEN_RACE doesn't belong here. Am I missing something
@niko1point0 what are your thoughts?
Author
There was a problem hiding this comment.
I think this may be a case of decomp moving gamemode logic to other modules. I'll see if I can find where the code originates from
Author
There was a problem hiding this comment.
@TheUbMunster
It's a regression caused by 0de8ca3:
sdata->Loading.OnBegin.RemBitsConfig8 |= TOKEN_RACE; was removed and swapped for the wrong RemBitsConfig field.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Decomp:
The end of a regular adventure race is supposed to remove the
TOKEN_RACEflag fromgGT->gameMode2.However, due to an oversight,
TOKEN_RACEis marked to be removed viasdata->Loading.OnBegin.RemBitsConfig0, which is used forgGT->gameMode1, the wrong gamemode field.Due to this, finishing a CTR Token Challenge in Adventure Mode does not clear the token race flag. If you finish a CTR Token Challenge, then enter a track where you have not beaten the trophy race yet, then you will be thrown into the CTR Token Challenge right away.
This PR addresses this by assigning the
TOKEN_RACEvalue to the correctRemBitsConfigfield.